Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 20:03:15 +0000 (13:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 20:03:15 +0000 (13:03 -0700)
commit46be2ff4530f09ec59685b3b04da84ddc8d1fc3a
treed5fe5166cec712fc73b9d1d6f2f03eb4aea4b2fe
parente9be2199b25ab2ecc28928553a443cb0ff57ad2a
parenta344601e9c741f1cfb58eb02df3a8add4ce5c129
Merge from trunk.
src/ChangeLog
src/gtkutil.c
src/xdisp.c
src/xterm.c
src/xterm.h